Hide welcome message when GET attribute are available

4 files changed, 14 insertions, 4 deletions

diff --git a/templates/chimere/blocks/welcome.html b/templates/chimere/blocks/welcome.html
index ae98814..f09710a 100644
--- a/templates/chimere/blocks/welcome.html
+++ b/templates/chimere/blocks/welcome.html
@@ -6,7 +6,8 @@ $(function(){
     $('#welcome div.media-player').jmeEmbedControls();
     $('#welcome video').each(function(index){$(this).pause()});
     $('#welcome audio').each(function(index){$(this).pause()});
-    $("#welcome").dialog({width:826, height:490, dialogClass:'welcome-dialog'});
+    $("#welcome").dialog({width:826, height:490, dialogClass:'welcome-dialog'
+                          {% if not display %}, autoOpen:false{% endif %}});
 });
 // -->
 </script>
diff --git a/templates/chimere/main_map.html b/templates/chimere/main_map.html
index 2f06030..f72c050 100644
--- a/templates/chimere/main_map.html
+++ b/templates/chimere/main_map.html
@@ -80,9 +80,9 @@
     </div>
     <div id='detail' class='ui-widget ui-corner-all'></div>
     <div id='permalink' style='display:none'></div>
-    {% display_welcome %}
+    {% display_welcome news_visible %}
     {% display_news news_visible %}
-    {{block.super}}
+    {{ block.super }}
     <div id='map-shadow'></div>
     <div id='default-message'></div>
 <script type="text/javascript">
diff --git a/urls.py b/urls.py
index ea4e106..739c2f0 100644
--- a/urls.py
+++ b/urls.py
@@ -46,6 +46,8 @@ urlpatterns += patterns('',
         'chimere_saclay.views.edit_route', name="edit-route"),
     url(r'^(?P<area_name>[a-zA-Z0-9_-]+/)?edit-route/(?P<item_id>\w+)/(?P<submited>\w+)?$',
         'chimere_saclay.views.edit_route', name="edit-route-item"),
+    url(r'^(saclay/)?$', 'chimere_saclay.views.index_saclay',
+        name="index-saclay"),
     url(r'^', include('chimere.urls', namespace="chimere")),
 )
 
diff --git a/views.py b/views.py
index 0be5d77..b985342 100644
--- a/views.py
+++ b/views.py
@@ -25,7 +25,14 @@ from forms import MarkerForm, RouteForm
 
 from chimere.actions import actions
 from chimere.models import Marker, Route, PropertyModel
-from chimere.views import get_edit_page
+from chimere.views import get_edit_page, index
+
+def index_saclay(request, area_name=None, default_area=None, simple=False):
+    tpl, response_dct = index(request, area_name, default_area, simple,
+                              get_response=True)
+    response_dct['news_visible'] = False if request.GET else True
+    return render_to_response(tpl, response_dct,
+                              context_instance=RequestContext(request))
 
 get_edit_marker = get_edit_page('edit', Marker, MarkerForm)